Autogenerated HTML docs for v1.6.1-35-g3827
diff --git a/git-config.html b/git-config.html index e1c6f21..76f578f 100644 --- a/git-config.html +++ b/git-config.html
@@ -2544,6 +2544,26 @@ </p> </dd> <dt> +mergetool.keepTemporaries +</dt> +<dd> +<p> + When invoking a custom merge tool, git uses a set of temporary + files to pass to the tool. If the tool returns an error and this + variable is set to <tt>true</tt>, then these temporary files will be + preserved, otherwise they will be removed after the tool has + exited. Defaults to <tt>false</tt>. +</p> +</dd> +<dt> +mergetool.prompt +</dt> +<dd> +<p> + Prompt before each invocation of the merge resolution program. +</p> +</dd> +<dt> pack.window </dt> <dd> @@ -3017,7 +3037,7 @@ </div> <div id="footer"> <div id="footer-text"> -Last updated 2008-12-22 08:27:05 UTC +Last updated 2009-01-01 22:04:58 UTC </div> </div> </body>
